removed redundant qAsConst

Signed-off-by: Pablo Ariño Muñoz <progpabarino@gmail.com>

diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 91228771816175badb8bd61863787060c50f1da3..8ccd5d09d816a5b7faadc94c1792e762be46863c 100644 (file)
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -950,7 +950,7 @@ Result<void, QString> SyncJournalDb::setFileRecord(const SyncJournalFileRecord &
     if (!_etagStorageFilter.isEmpty()) {
         // If we are a directory that should not be read from db next time, don't write the etag
         QByteArray prefix = record._path + "/";
-        for (const QByteArray &it : qAsConst(_etagStorageFilter)) {
+        for (const QByteArray &it : _etagStorageFilter) {
             if (it.startsWith(prefix)) {
                 qCInfo(lcDb) << "Filtered writing the etag of" << prefix << "because it is a prefix of" << it;
                 record._etag = "_invalid_";
@@ -1718,7 +1718,7 @@ static bool deleteBatch(SqlQuery &query, const QStringList &entries, const QStri
 
     qCDebug(lcDb) << "Removing stale" << name << "entries:" << entries.join(QStringLiteral(", "));
     // FIXME: Was ported from execBatch, check if correct!
-    for (const QString &entry : qAsConst(entries)) {
+    for (const QString &entry : entries) {
         query.reset_and_clear_bindings();
         query.bindValue(1, entry);
         if (!query.exec()) {

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index c198b40bd0767a37944395b1cf1fa8cdd96a51a4..06e34224a4f2846c2043b9461ca8fc38d405dc73 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -337,7 +337,7 @@ bool FolderWizardRemotePath::selectByPath(QString path)
     QTreeWidgetItem *it = _ui.folderTreeWidget->topLevelItem(0);
     if (!path.isEmpty()) {
         const QStringList pathTrail = path.split(QLatin1Char('/'));
-        for (const QString &path : qAsConst(pathTrail)) {
+        for (const QString &path : pathTrail) {
             if (!it) {
                 return false;
             }

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 92bdd74f2e1212a587943611ba9c5a0f52778e75..3d497afeb90e0afb07131039def5a8a81cf86c12 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -358,7 +358,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
 #ifdef Q_OS_WIN
         // Windows has a 128-char tray tooltip length limit.
         QStringList accountNames;
-        for (const AccountStatePtr &a : qAsConst(problemAccounts)) {
+        for (const AccountStatePtr &a : problemAccounts) {
             accountNames.append(a->account()->displayName());
         }
         _tray->setToolTip(tr("Disconnected from %1").arg(accountNames.join(QLatin1String(", "))));
@@ -570,7 +570,7 @@ void ownCloudGui::slotLogin()
         account->signIn();
     } else {
         auto list = AccountManager::instance()->accounts();
-        for (const auto &a : qAsConst(list)) {
+        for (const auto &a : list) {
             a->signIn();
         }
     }
@@ -584,7 +584,7 @@ void ownCloudGui::slotLogout()
         list.append(account);
     }
 
-    for (const auto &ai : qAsConst(list)) {
+    for (const auto &ai : list) {
         ai->signOutByUi();
     }
 }

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 5bd2246cea899ef5b312f75b5c2f23314125a7e8..6cc742684bc2bb5eb730cb5544e3b82dc750dfd7 100644 (file)
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -166,7 +166,7 @@ void SelectiveSyncWidget::recursiveInsert(QTreeWidgetItem *parent, QStringList p
             if (parent->checkState(0) == Qt::Checked
                 || parent->checkState(0) == Qt::PartiallyChecked) {
                 item->setCheckState(0, Qt::Checked);
-                for (const QString &str : qAsConst(_oldBlackList)) {
+                for (const QString &str : _oldBlackList) {
                     if (str == path || str == QLatin1String("/")) {
                         item->setCheckState(0, Qt::Unchecked);
                         break;
@@ -425,7 +425,7 @@ QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem *root) const
     } else {
         // We did not load from the server so we reuse the one from the old black list
         QString path = root->data(0, Qt::UserRole).toString();
-        for (const QString &it : qAsConst(_oldBlackList)) {
+        for (const QString &it : _oldBlackList) {
             if (it.startsWith(path))
                 result += it;
         }
@@ -533,7 +533,7 @@ void SelectiveSyncDialog::accept()
         // (the ones that are no longer in the blacklist)
         auto blackListSet = QSet<QString>{blackList.begin(), blackList.end()};
         auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet);
-        for (const auto &it : qAsConst(changes)) {
+        for (const auto &it : changes) {
             _folder->journalDb()->schedulePathForRemoteDiscovery(it);
             _folder->schedulePathForLocalDiscovery(it);
         }

diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index b157a50c59247f23b422d0cb1c3ad900baad09af..9b7ad20c09588a4f031460577131a756fcd07f75 100644 (file)
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -559,7 +559,7 @@ const QList<SharePtr> ShareManager::parseShares(const QJsonDocument &reply) cons
 
     QList<SharePtr> shares;
 
-    for (const auto &share : qAsConst(tmpShares)) {
+    for (const auto &share : tmpShares) {
         auto data = share.toObject();
 
         auto shareType = data.value("share_type").toInt();

diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index 43fc92fb4ede82fb4b60d4f366decf5acb4ceedc..08c389e7d45502476727fb520038b5013420575f 100644 (file)
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -141,7 +141,7 @@ bool SslErrorDialog::checkFailingCertsKnown(const QList<QSslError> &errors)
     for (const QSslCertificate &cert : _unknownCerts) {
         msg += QL("<div id=\"ca_error\">");
         // add the errors for this cert
-        for (const auto &err : qAsConst(errors)) {
+        for (const auto &err : errors) {
             if (err.certificate() == cert) {
                 msg += QL("<p>") + err.errorString() + QL("</p>");
             }

diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp
index d702f5a117d88cdacb0f9876fe243f099785b5f2..7e4b62e157b450a00d70554541b740b92a04439e 100644 (file)
--- a/src/gui/tray/activitydata.cpp
+++ b/src/gui/tray/activitydata.cpp
@@ -174,7 +174,7 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP
     }
 
     auto actions = json.value("actions").toArray();
-    for (auto action : qAsConst(actions)) {
+    for (auto action : actions) {
         activity._links.append(ActivityLink::createFomJsonObject(action.toObject()));
     }
 

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index 50d7e58116657a367794fec031d832d0985d8bfc..246c9b2fa898a9ca7fefeedcef8e3626422eceb1 100644 (file)
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -278,7 +278,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         return displayLocation();
     case ActionsLinksRole: {
         QList<QVariant> customList;
-        for (const ActivityLink &activityLink : qAsConst(a._links)) {
+        for (const ActivityLink &activityLink : a._links) {
             customList << QVariant::fromValue(activityLink);
         }
         return customList;
@@ -610,7 +610,7 @@ void ActivityListModel::addIgnoredFileToList(const Activity &newActivity)
         return;
     }
 
-    for (const Activity &activity : qAsConst(_listOfIgnoredFiles)) {
+    for (const Activity &activity : _listOfIgnoredFiles) {
         if (activity._file == newActivity._file) {
             duplicate = true;
             break;

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 1302b66566f5f35ce7f4eb0ba3cf25ea954c0ac6..b3594f9418467d79b1356d2f9483805f342cd775 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -567,7 +567,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList<QSslError> errors)
     NetworkJobTimeoutPauser pauser(reply);
     QString out;
     QDebug(&out) << "SSL-Errors happened for url " << reply->url().toString();
-    for (const QSslError &error : qAsConst(errors)) {
+    for (const auto &error : errors) {
         QDebug(&out) << "\tError in " << error.certificate() << ":"
                      << error.errorString() << "(" << error.error() << ")"
                      << "\n";
@@ -577,7 +577,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList<QSslError> errors)
     qCInfo(lcAccount()) << reply->sslConfiguration().peerCertificateChain();
 
     bool allPreviouslyRejected = true;
-    for (const QSslError &error : qAsConst(errors)) {
+    for (const auto &error : errors) {
         if (!_rejectedCertificates.contains(error.certificate())) {
             allPreviouslyRejected = false;
         }
@@ -624,7 +624,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList<QSslError> errors)
             return;
 
         // Mark all involved certificates as rejected, so we don't ask the user again.
-        for (const QSslError &error : qAsConst(errors)) {
+        for (const auto &error : errors) {
             if (!_rejectedCertificates.contains(error.certificate())) {
                 _rejectedCertificates.append(error.certificate());
             }
@@ -939,7 +939,7 @@ void Account::slotDirectEditingRecieved(const QJsonDocument &json)
     auto data = json.object().value("ocs").toObject().value("data").toObject();
     auto editors = data.value("editors").toObject();
 
-    for (const auto &editorKey : qAsConst(editors.keys())) {
+    for (const auto &editorKey : editors.keys()) {
         auto editor = editors.value(editorKey).toObject();
 
         const QString id = editor.value("id").toString();
@@ -951,11 +951,11 @@ void Account::slotDirectEditingRecieved(const QJsonDocument &json)
 
             auto *directEditor = new DirectEditor(id, name);
 
-            for (const auto &mimeType : qAsConst(mimeTypes)) {
+            for (const auto &mimeType : mimeTypes) {
                 directEditor->addMimetype(mimeType.toString().toLatin1());
             }
 
-            for (const auto &optionalMimeType : qAsConst(optionalMimeTypes)) {
+            for (const auto &optionalMimeType : optionalMimeTypes) {
                 directEditor->addOptionalMimetype(optionalMimeType.toString().toLatin1());
             }
 

diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index b43f29a995fae97574ccebaeec35b9130d0d252d..b8a54d812182bb9fc3da3e2163623d1d39635629 100644 (file)
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -211,7 +211,7 @@ bool Capabilities::isClientStatusReportingEnabled() const
 QList<QByteArray> Capabilities::supportedChecksumTypes() const
 {
     QList<QByteArray> list;
-    for (const auto &t : qAsConst(_capabilities["checksums"].toMap()["supportedTypes"].toList())) {
+    for (const auto &t : _capabilities["checksums"].toMap()["supportedTypes"].toList()) {
         list.push_back(t.toByteArray());
     }
     return list;
@@ -373,7 +373,7 @@ bool Capabilities::privateLinkPropertyAvailable() const
 QList<int> Capabilities::httpErrorCodesThatResetFailingChunkedUploads() const
 {
     QList<int> list;
-    for (const auto &t : qAsConst(_capabilities["dav"].toMap()["httpErrorCodesThatResetFailingChunkedUploads"].toList())) {
+    for (const auto &t : _capabilities["dav"].toMap()["httpErrorCodesThatResetFailingChunkedUploads"].toList()) {
         list.push_back(t.toInt());
     }
     return list;

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 8fa4012576ada04abf4f1e272304aad386e38a3b..7f8e2ddf2de6a11dc4d4e0a9873874fc055dee5e 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -141,7 +141,7 @@ bool copy_dir_recursive(QString from_dir, QString to_dir)
     from_dir += QDir::separator();
     to_dir += QDir::separator();
 
-    for (const QString &copy_file : qAsConst(dir.entryList(QDir::Files))) {
+    for (const QString &copy_file : dir.entryList(QDir::Files)) {
         QString from = from_dir + copy_file;
         QString to = to_dir + copy_file;
 
@@ -150,7 +150,7 @@ bool copy_dir_recursive(QString from_dir, QString to_dir)
         }
     }
 
-    for (const QString &copy_dir : qAsConst(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
+    for (const QString &copy_dir : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
         QString from = from_dir + copy_dir;
         QString to = to_dir + copy_dir;
 

diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp
index 57e5ce267f8e6682a95244b70d00bec0d886fd8d..4d739a737f968e54c0f03edddea04cd0b3c99a15 100644 (file)
--- a/src/libsync/cookiejar.cpp
+++ b/src/libsync/cookiejar.cpp
@@ -139,7 +139,7 @@ bool CookieJar::restore(const QString &fileName)
 QList<QNetworkCookie> CookieJar::removeExpired(const QList<QNetworkCookie> &cookies)
 {
     QList<QNetworkCookie> updatedList;
-    for (const QNetworkCookie &cookie : qAsConst(cookies)) {
+    for (const QNetworkCookie &cookie : cookies) {
         if (cookie.expirationDate() > QDateTime::currentDateTimeUtc() && !cookie.isSessionCookie()) {
             updatedList << cookie;
         }

diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index a1540ebe46153403506493e3eba926dff6a0c778..edc9a05dbdb0dcb4c6e468c2b5824632af7aba9b 100644 (file)
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -346,7 +346,7 @@ void LsColJob::start()
         qCWarning(lcLsColJob) << "Propfind with no properties!";
     }
     QByteArray propStr;
-    for (const QByteArray &prop : qAsConst(properties)) {
+    for (const QByteArray &prop : properties) {
         if (prop.contains(':')) {
             int colIdx = prop.lastIndexOf(":");
             auto ns = prop.left(colIdx);

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 55f090ec062119026c74cdb849abbbeaff1d6428..0eac962d97a80633139e6033faee35ab22c6e1e0 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -555,7 +555,7 @@ void OwncloudPropagator::start(SyncFileItemVector &&items)
     QVector<PropagatorJob *> directoriesToRemove;
     QString removedDirectory;
     QString maybeConflictDirectory;
-    for (const SyncFileItemPtr &item : qAsConst(items)) {
+    for (const SyncFileItemPtr &item : items) {
         if (!removedDirectory.isEmpty() && item->_file.startsWith(removedDirectory)) {
             // this is an item in a directory which is going to be removed.
             auto *delDirJob = qobject_cast<PropagateDirectory *>(directoriesToRemove.first());
@@ -643,7 +643,7 @@ void OwncloudPropagator::startDirectoryPropagation(const SyncFileItemPtr &item,
         // checkForPermissions() has already run and used the permissions
         // of the file we're about to delete to decide whether uploading
         // to the new dir is ok...
-        for (const SyncFileItemPtr &dirItem : qAsConst(items)) {
+        for (const SyncFileItemPtr &dirItem : items) {
             if (dirItem->destination().startsWith(item->destination() + "/")) {
                 dirItem->_instruction = CSYNC_INSTRUCTION_NONE;
                 _anotherSyncNeeded = true;

diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp
index 1f6f475c9122f46f8739132abc9e24431f5512ef..96e4bbe2aa463af0bc8aebb984e8c2d8ab20f0ad 100644 (file)
--- a/src/libsync/progressdispatcher.cpp
+++ b/src/libsync/progressdispatcher.cpp
@@ -369,7 +369,7 @@ void ProgressInfo::updateEstimates()
 void ProgressInfo::recomputeCompletedSize()
 {
     qint64 r = _totalSizeOfCompletedJobs;
-    for (const ProgressItem &i : qAsConst(_currentItems)) {
+    for (const ProgressItem &i : _currentItems) {
         if (isSizeDependent(i._item))
             r += i._progress._completed;
     }

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 13d1381b83159b9f67173c5a1d8d489d46d1f654..f4bf34c1dd11c3df54675f1003dab0f45306317c 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -215,7 +215,7 @@ void SyncEngine::deleteStaleDownloadInfos(const SyncFileItemVector &syncItems)
 {
     // Find all downloadinfo paths that we want to preserve.
     QSet<QString> download_file_paths;
-    for (const SyncFileItemPtr &it : qAsConst(syncItems)) {
+    for (const SyncFileItemPtr &it : syncItems) {
         if (it->_direction == SyncFileItem::Down
             && it->_type == ItemTypeFile
             && isFileTransferInstruction(it->_instruction)) {
@@ -226,7 +226,7 @@ void SyncEngine::deleteStaleDownloadInfos(const SyncFileItemVector &syncItems)
     // Delete from journal and from filesystem.
     const QVector<SyncJournalDb::DownloadInfo> deleted_infos =
         _journal->getAndDeleteStaleDownloadInfos(download_file_paths);
-    for (const SyncJournalDb::DownloadInfo &deleted_info : qAsConst(deleted_infos)) {
+    for (const SyncJournalDb::DownloadInfo &deleted_info : deleted_infos) {
         const QString tmppath = _propagator->fullLocalPath(deleted_info._tmpfile);
         qCInfo(lcEngine) << "Deleting stale temporary file: " << tmppath;
         FileSystem::remove(tmppath);
@@ -237,7 +237,7 @@ void SyncEngine::deleteStaleUploadInfos(const SyncFileItemVector &syncItems)
 {
     // Find all blacklisted paths that we want to preserve.
     QSet<QString> upload_file_paths;
-    for (const SyncFileItemPtr &it, qAsConst(syncItems)) {
+    for (const SyncFileItemPtr &it, syncItems) {
         if (it->_direction == SyncFileItem::Up
             && it->_type == ItemTypeFile
             && isFileTransferInstruction(it->_instruction)) {
@@ -263,7 +263,7 @@ void SyncEngine::deleteStaleErrorBlacklistEntries(const SyncFileItemVector &sync
 {
     // Find all blacklisted paths that we want to preserve.
     QSet<QString> blacklist_file_paths;
-    for (const SyncFileItemPtr &it : qAsConst(syncItems)) {
+    for (const SyncFileItemPtr &it : syncItems) {
         if (it->_hasBlacklistEntry)
             blacklist_file_paths.insert(it->_file);
     }

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index 65dc75499763dd6d11d7dab0a659e50579bbbb5b..e3961f43d3a179c3e4966cc99fc7e9b05d28a0c0 100644 (file)
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -235,7 +235,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector &items)
     ProblemsMap oldProblems;
     std::swap(_syncProblems, oldProblems);
 
-    for (const SyncFileItemPtr &item : qAsConst(items)) {
+    for (const SyncFileItemPtr &item : items) {
         qCInfo(lcStatusTracker) << "Investigating" << item->destination() << item->_status << item->_instruction << item->_direction;
         _dirtyPaths.remove(item->destination());
 

diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
index da419229e046c3f2f4a83fd59e5f3b2513c782d6..abe87d97bb11099e9c538b83780c0bc8d288b2aa 100644 (file)
--- a/test/testnextcloudpropagator.cpp
+++ b/test/testnextcloudpropagator.cpp
@@ -81,7 +81,7 @@ private slots:
         tests.append(Test("\"fii\"-gzip", "fii"));
         tests.append(Test("W/\"foo\"", "foo"));
 
-        for (const auto &test : qAsConst(tests)) {
+        for (const auto &test : tests) {
             QCOMPARE(parseEtag(test.first), QByteArray(test.second));
         }
     }